Skip to content

Rely on pulpcore to set up Apache fragments#268

Merged
ehelms merged 2 commits intotheforeman:masterfrom
ekohl:remove-pulpcore-templates
Oct 13, 2020
Merged

Rely on pulpcore to set up Apache fragments#268
ehelms merged 2 commits intotheforeman:masterfrom
ekohl:remove-pulpcore-templates

Conversation

@ekohl
Copy link
Copy Markdown
Member

@ekohl ekohl commented Jun 26, 2020

This uses theforeman/puppet-pulpcore#105 to avoid defining all parts in this module. This means all functionality can be tested standalone in puppet-pulpcore as atomic units.

This was referenced Jun 29, 2020
Closed
Closed
@ehelms
Copy link
Copy Markdown
Member

ehelms commented Oct 7, 2020

@ekohl could you rebase this to allow combined testing ?

ehelms
ehelms reviewed Oct 8, 2020
View reviewed changes
Comment thread manifests/init.pp Outdated
@ekohl ekohl force-pushed the remove-pulpcore-templates branch from 80585b2 to 59b3de9 Compare October 8, 2020 20:49
ekohl
ekohl commented Oct 8, 2020
View reviewed changes
Comment thread .fixtures.yml
pulp: "https://github.com/theforeman/puppet-pulp.git"
pulpcore: "https://github.com/theforeman/puppet-pulpcore.git"
pulpcore:
repo: "https://github.com/ekohl/puppet-pulpcore.git"
Copy link
Copy Markdown
Member Author

@ekohl ekohl Oct 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This obviously needs to be converted in an updated minimum version in metadata.json.

Copy link
Copy Markdown
Member Author

@ekohl ekohl Oct 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needed to be changed before it was merged.

Copy link
Copy Markdown
Member Author

@ekohl ekohl Oct 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(pushed 45e251b directly to master)

@ekohl
Copy link
Copy Markdown
Member Author

ekohl commented Oct 8, 2020

Rebased. First commit is pretty unchanged other solving than the merge conflict and adding fixtures.yml. The second commit is an untested change that I think adds support for running Pulpcore on a content proxy.

@ekohl ekohl force-pushed the remove-pulpcore-templates branch from 0f78ca7 to e971fcf Compare October 9, 2020 20:03
@ekohl ekohl force-pushed the remove-pulpcore-templates branch from dfba558 to 6911c32 Compare October 10, 2020 15:10
@ekohl
Copy link
Copy Markdown
Member Author

ekohl commented Oct 10, 2020

The initial support to run without Foreman is here. I suspect that on EL8 (or without Pulp 2 on EL7) it will fail because it doesn't set the certificates yet. Currently running an EL7 pipeline.

ehelms
ehelms reviewed Oct 10, 2020
View reviewed changes
Comment thread manifests/init.pp
$apache_http_vhost = 'pulp-http'
$apache_https_vhost = 'pulp-https'
Class['pulp::apache'] -> Class['pulpcore::apache']
} else {
Copy link
Copy Markdown
Member

@ehelms ehelms Oct 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This else is stand-alone Pulpcore? aka a mirror?

Copy link
Copy Markdown
Member Author

@ekohl ekohl Oct 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but without a Pulp 2 install. I haven't tested this branch yet, but I think you'll hit this if you spin up an EL8 proxy (if we provide the correct parameters).

@ehelms
Copy link
Copy Markdown
Member

ehelms commented Oct 10, 2020

Looks like maybe something isn't entirely configured properly on a mirror:

    # (in test file fb-proxy.bats, line 26)
    #   `hammer capsule content synchronize --id=$PROXY_ID' failed with status 70
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.0/1, 0%, elapsed: 00:00:00
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.05/1, 5%, 0.0/s, elapsed: 00:00:02, ETA: 00:00:41
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:04, ETA: 00:00:39
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:06, ETA: 00:00:59
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:08, ETA: 00:01:19
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:10, ETA: 00:01:39
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:13, ETA: 00:01:59
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:15, ETA: 00:04:00
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:17
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:19
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:21
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.1/1, 10%, 0.0/s, elapsed: 00:00:23
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:26, ETA: 00:03:02
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:28, ETA: 00:03:02
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:30, ETA: 00:03:02
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:32, ETA: 00:03:02
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:34, ETA: 00:03:02
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:37, ETA: 00:03:02
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:39
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:41
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:43
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:46
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:50
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:52
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:54
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 0.16/1, 16%, 0.0/s, elapsed: 00:00:56
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e running: 1.0/1, 100%, 0.0/s, elapsed: 00:00:58
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e warning: 1.0/1, 100%, 0.0/s, elapsed: 00:01:00
    # Task 207f1083-c916-41c5-96e0-518d0d19b29e warning: 1.0/1, 100%, 0.0/s, elapsed: 00:01:00
    # Error: RPM1004: Error retrieving metadata: Error 'Proxy Error' for https://pipeline-katello-server-nightly-centos7.war.example.com/pulp/repos/Test_Organization/Library/Test_CV/custom/Test_Product/Zoo/repodata/76b2c1c5b8ac8a1b9a88c15c2fe82e23cacbfb864ecf55e6b22da879d8cb3ce2-updateinfo.xml.gz.
    not ok 4 content is available from proxy
    # (in test file fb-proxy.bats, line 31)
    #   `URL2="http://${PROXY_HOSTNAME}/pulp/repos/${ORGANIZATION_LABEL}/Library/${CONTENT_VIEW_LABEL}/custom/${PRODUCT_LABEL}/${YUM_REPOSITORY_LABEL}/Packages/w/walrus-0.71-1.noarch.rpm"' failed
    #   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
    #                                  Dload  Upload   Total   Spent    Left  Speed
    #   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
    # curl: (22) The requested URL returned error: 404 Not Found
    #   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
    #                                  Dload  Upload   Total   Spent    Left  Speed
    #   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
    # curl: (22) The requested URL returned error: 404 Not Found

@ekohl
Copy link
Copy Markdown
Member Author

ekohl commented Oct 10, 2020

I noticed the same thing, but couldn't track it down yet.

@ehelms ehelms marked this pull request as ready for review October 13, 2020 12:34
@ehelms ehelms merged commit 5718a34 into theforeman:master Oct 13, 2020
@ekohl ekohl deleted the remove-pulpcore-templates branch October 13, 2020 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ehelms ehelms ehelms approved these changes

Assignees

No one assigned

Labels

Backwards incompatible Needs testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ekohl @ehelms @theforeman-bot @wbclark